From a659d3d2daa63dffde85d516b675e1127404d1f6 Mon Sep 17 00:00:00 2001
From: robertl <robertl@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Fri, 20 Oct 2006 19:30:45 +0000
Subject: [PATCH] KML changess: Don't use palettes for icons.  That's sooo
 2004. Add icons for realtime positioning.  Color the auto depending on last
 position  time relative to current time.

Tweak reference files for test suite.


git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@2417 f51c46e8-681c-474f-0cfe-069cfd0219fb
---
 gpsbabel/kml.c                         | 72 ++++++++++++++++++++------
 gpsbabel/reference/earth-expertgps.kml | 31 +++--------
 gpsbabel/reference/earth-gc.kml        | 31 +++--------
 3 files changed, 68 insertions(+), 66 deletions(-)

diff --git a/gpsbabel/kml.c b/gpsbabel/kml.c
index 92a5e7fa8..41fa5f491 100644
--- a/gpsbabel/kml.c
+++ b/gpsbabel/kml.c
@@ -102,6 +102,16 @@ arglist_t kml_args[] = {
 	ARG_TERMINATOR
 };
 
+static 
+struct {
+	int freshness;
+	char *icon;
+} kml_tracking_icons[] = {
+ { 60, "http://maps.google.com/mapfiles/kml/pal4/icon15.png" }, // Red
+ { 30, "http://maps.google.com/mapfiles/kml/pal4/icon31.png" }, // Yellow
+ { 0, "http://maps.google.com/mapfiles/kml/pal4/icon62.png" }, // Green
+};
+
 #define MYNAME "kml"
 
 #if ! HAVE_LIBEXPAT
@@ -343,8 +353,7 @@ kml_write_xmle(const char *tag, const char *v)
 }
 
 #define hovertag(h) h ? 'h' : 'n'
-static void kml_write_bitmap_style_(const char *style, int bitmap, 
-	                               int x, int y, int width, int height, 
+static void kml_write_bitmap_style_(const char *style, const char * bitmap, 
 				       int highlighted)
 {
 	kml_write_xml(0,"<!-- %s %s style -->\n", 
@@ -355,10 +364,7 @@ static void kml_write_bitmap_style_(const char *style, int bitmap,
 		kml_write_xml(0, "<scale>1.2</scale>\n");
 	}
 	kml_write_xml(1, "<Icon>\n");
-	kml_write_xml(0, "<href>root://icons/bitmap-%d.png</href>\n", bitmap);
-	kml_write_xml(0, "<x>%d</x>\n", x);
-	kml_write_xml(0, "<w>%d</w>\n", width);
-	kml_write_xml(0, "<h>%d</h>\n", height);
+	kml_write_xml(0, "<href>%s</href>\n", bitmap);
 	kml_write_xml(-1, "</Icon>\n");
 	kml_write_xml(-1, "</IconStyle>\n");
 	kml_write_xml(-1, "</Style>\n");
@@ -368,11 +374,10 @@ static void kml_write_bitmap_style_(const char *style, int bitmap,
  * and non-highlighted version of the style to allow the icons
  * to magnify slightly on a rollover.
  */
-static void kml_write_bitmap_style(const char *style, int bitmap, 
-	                               int x, int y, int width, int height)
+static void kml_write_bitmap_style(const char *style, const char *bitmap)
 {
-	kml_write_bitmap_style_(style, bitmap, x, y, width, height, 0);
-	kml_write_bitmap_style_(style, bitmap, x, y, width, height, 1);
+	kml_write_bitmap_style_(style, bitmap, 0);
+	kml_write_bitmap_style_(style, bitmap, 1);
 
 	kml_write_xml(1, "<StyleMap id=\"%s\">\n", style);
 	kml_write_xml(1, "<Pair>\n");
@@ -782,13 +787,15 @@ void kml_write(void)
 		kml_write_xml(0, "<name>GPS position</name>\n");
 	else
 		kml_write_xml(0, "<name>GPS device</name>\n");
-	
-	kml_write_xml(0, "<Snippet>Created %s</Snippet>\n", import_time);
+
+	if (now) {
+		kml_write_xml(0, "<Snippet>Created %s</Snippet>\n", import_time);
+	}
 
 	// Style settings for bitmaps
-	kml_write_bitmap_style("route", 4, 160, 0, 32, 32);
-	kml_write_bitmap_style("track", 4, 128, 0, 32, 32);
-	kml_write_bitmap_style("waypoint", 4, 160, 0, 32, 32);
+	kml_write_bitmap_style("route", "http://maps.google.com/mapfiles/kml/pal4/icon61.png");
+	kml_write_bitmap_style("track", "http://maps.google.com/mapfiles/kml/pal4/icon60.png");
+	kml_write_bitmap_style("waypoint", "http://maps.google.com/mapfiles/kml/pal4/icon61.png");
         
         // Style settings for line strings
         kml_write_xml(1, "<Style id=\"lineStyle\">\n");
@@ -831,22 +838,55 @@ void kml_write(void)
 	kml_write_xml(-1, "</kml>\n");
 }
 
+/*
+ * This depends on the table being sorted correctly.
+ */
+static 
+char *
+kml_get_posn_icon(int freshness)
+{
+	int i;
+	for (i = 0; i < sizeof(kml_tracking_icons) / sizeof(kml_tracking_icons[0]); i++) {
+		if (freshness >= kml_tracking_icons[i].freshness)
+			return kml_tracking_icons[i].icon;
+	}
+	return "http://maps.google.com/mapfiles/kml/pal3/icon59.png";
+}
+
+
 static void
 kml_wr_position(waypoint *wpt)
 {
 	static route_head *trk_head = NULL;
+	static time_t last_valid_fix;
 	waypoint *t = waypt_dupe(wpt);
 
+	if (last_valid_fix == 0) last_valid_fix = current_time();
+
 	/* We want our waypoint to have a name, but not our trackpoint */	
 	if (!wpt->shortname) {
 		if (wpt->fix == fix_none) {
 			wpt->shortname = xstrdup("ESTIMATED Position");
-			wpt->icon_descr = "http://maps.google.com/mapfiles/kml/pal3/icon59.png";
 		} else {
 			wpt->shortname = xstrdup("Position");
 		}
 	}
 
+	switch (wpt->fix) {
+		case fix_none:
+			if (wpt->shortname) {
+				xfree (wpt->shortname);
+			}
+			wpt->shortname = xstrdup("ESTIMATED Position");
+			break;
+		case fix_unknown:
+			break;
+		default:
+			last_valid_fix = wpt->creation_time;
+	}
+
+
+	wpt->icon_descr = kml_get_posn_icon(wpt->creation_time - last_valid_fix);
 	if (!trk_head) {
 		trk_head = route_head_alloc();
 		track_add_head(trk_head);
diff --git a/gpsbabel/reference/earth-expertgps.kml b/gpsbabel/reference/earth-expertgps.kml
index c1d9418fc..c434cb89c 100644
--- a/gpsbabel/reference/earth-expertgps.kml
+++ b/gpsbabel/reference/earth-expertgps.kml
@@ -2,15 +2,11 @@
 <kml xmlns="http://earth.google.com/kml/2.1">
   <Document xmlns:xlink="http://www.w3/org/1999/xlink">
     <name>GPS device</name>
-    <Snippet>Created Wed Dec 31 18:00:00 1969</Snippet>
 <!-- Normal route style -->
     <Style id="route_n">
       <IconStyle>
         <Icon>
-          <href>root://icons/bitmap-4.png</href>
-          <x>160</x>
-          <w>32</w>
-          <h>32</h>
+          <href>http://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -19,10 +15,7 @@
       <IconStyle>
         <scale>1.2</scale>
         <Icon>
-          <href>root://icons/bitmap-4.png</href>
-          <x>160</x>
-          <w>32</w>
-          <h>32</h>
+          <href>http://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -40,10 +33,7 @@
     <Style id="track_n">
       <IconStyle>
         <Icon>
-          <href>root://icons/bitmap-4.png</href>
-          <x>128</x>
-          <w>32</w>
-          <h>32</h>
+          <href>http://maps.google.com/mapfiles/kml/pal4/icon60.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -52,10 +42,7 @@
       <IconStyle>
         <scale>1.2</scale>
         <Icon>
-          <href>root://icons/bitmap-4.png</href>
-          <x>128</x>
-          <w>32</w>
-          <h>32</h>
+          <href>http://maps.google.com/mapfiles/kml/pal4/icon60.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -73,10 +60,7 @@
     <Style id="waypoint_n">
       <IconStyle>
         <Icon>
-          <href>root://icons/bitmap-4.png</href>
-          <x>160</x>
-          <w>32</w>
-          <h>32</h>
+          <href>http://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -85,10 +69,7 @@
       <IconStyle>
         <scale>1.2</scale>
         <Icon>
-          <href>root://icons/bitmap-4.png</href>
-          <x>160</x>
-          <w>32</w>
-          <h>32</h>
+          <href>http://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
         </Icon>
       </IconStyle>
     </Style>
diff --git a/gpsbabel/reference/earth-gc.kml b/gpsbabel/reference/earth-gc.kml
index 9861e21cc..e7c301f8b 100644
--- a/gpsbabel/reference/earth-gc.kml
+++ b/gpsbabel/reference/earth-gc.kml
@@ -2,15 +2,11 @@
 <kml xmlns="http://earth.google.com/kml/2.1">
   <Document xmlns:xlink="http://www.w3/org/1999/xlink">
     <name>GPS device</name>
-    <Snippet>Created Wed Dec 31 18:00:00 1969</Snippet>
 <!-- Normal route style -->
     <Style id="route_n">
       <IconStyle>
         <Icon>
-          <href>root://icons/bitmap-4.png</href>
-          <x>160</x>
-          <w>32</w>
-          <h>32</h>
+          <href>http://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -19,10 +15,7 @@
       <IconStyle>
         <scale>1.2</scale>
         <Icon>
-          <href>root://icons/bitmap-4.png</href>
-          <x>160</x>
-          <w>32</w>
-          <h>32</h>
+          <href>http://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -40,10 +33,7 @@
     <Style id="track_n">
       <IconStyle>
         <Icon>
-          <href>root://icons/bitmap-4.png</href>
-          <x>128</x>
-          <w>32</w>
-          <h>32</h>
+          <href>http://maps.google.com/mapfiles/kml/pal4/icon60.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -52,10 +42,7 @@
       <IconStyle>
         <scale>1.2</scale>
         <Icon>
-          <href>root://icons/bitmap-4.png</href>
-          <x>128</x>
-          <w>32</w>
-          <h>32</h>
+          <href>http://maps.google.com/mapfiles/kml/pal4/icon60.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -73,10 +60,7 @@
     <Style id="waypoint_n">
       <IconStyle>
         <Icon>
-          <href>root://icons/bitmap-4.png</href>
-          <x>160</x>
-          <w>32</w>
-          <h>32</h>
+          <href>http://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
         </Icon>
       </IconStyle>
     </Style>
@@ -85,10 +69,7 @@
       <IconStyle>
         <scale>1.2</scale>
         <Icon>
-          <href>root://icons/bitmap-4.png</href>
-          <x>160</x>
-          <w>32</w>
-          <h>32</h>
+          <href>http://maps.google.com/mapfiles/kml/pal4/icon61.png</href>
         </Icon>
       </IconStyle>
     </Style>
-- 
2.30.2